cross

Gbp-Pq: Name cross.patch

diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
index 06d7d532d7aeef78e64a42b65bc5c9084ef0969a..246771df057289670b46a5cf79c1d3ba111fa018 100644 (file)
--- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt
@@ -15,6 +15,6 @@ if(TARGET Qt6::Xml)
     qt_internal_add_example(masterdetail)
 endif()
 
-if(NOT CMAKE_CROSSCOMPILING)
+if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
     qt_internal_add_example(sqlbrowser)
 endif()

diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake
index f8188200601e5c1e0b52b6695f8dd8a5b83b9419..fa2b93e5af7751966551baea88d9acfca3f73938 100644 (file)
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -9,7 +9,7 @@ qt_feature("androiddeployqt" PRIVATE
     SECTION "Deployment"
     LABEL "Android deployment tool"
     PURPOSE "The Android deployment tool automates the process of creating Android packages."
-    CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
 
 qt_feature("macdeployqt" PRIVATE
     SECTION "Deployment"